Merge changes from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:49:43 +0000 (16:49 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 20 Apr 2012 08:49:43 +0000 (16:49 +0800)

Trivial merge